merge trunk
authorKenichi Handa <handa@etlken>
Tue, 29 Jun 2010 02:41:29 +0000 (11:41 +0900)
committerKenichi Handa <handa@etlken>
Tue, 29 Jun 2010 02:41:29 +0000 (11:41 +0900)
commit373c0cfc0ecaf45384c9c940fa233d8ce84fd98a
tree3fd1833a305abc5aefdb872efaa48ddaa2b6c0b3
parent9f5cbf7553989b508e66a8b160ee08a00c366f10
parent53722fc0266252a294a3bd78051732033cab7988
merge trunk